Produced by Araxis Merge on 2021-07-21 10:22:18 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/configed_css | settings_demo1_fr.css | 2021-04-28 03:14:22 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/configed_css | settings_demo1_fr.css | 2021-06-27 10:07:32 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 382 |
| Changed | 1 | 2 |
| Inserted | 1 | 3 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | /** | 1 | /** | |||
| 2 | * WARNING: Do not change this file. Your changes will be lost. | 2 | * WARNING: Do not change this file. Your changes will be lost. | |||
| 3 | * 2021-04-28 03:14:21 */ | 3 | * 2021-06-27 10:07:31 */ | |||
| 4 | @import url('https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400;0,500;0,600;0,700;0,800;0,900;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');body.boxed { | 4 | @import url('https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400;0,500;0,600;0,700;0,800;0,900;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');body.boxed { | |||
| 5 | } | 5 | } | |||
| 6 | @media (min-width: 768px) { | 6 | @media (min-width: 768px) { | |||
| 7 | .page-layout-1column .product-info-main, .page-layout-2columns-left .product-info-main, .page-layout-2columns-right .product-info-main, .page-layout-3columns .product-info-main,.page-product-downloadable .product-options-bottom { | 7 | .page-layout-1column .product-info-main, .page-layout-2columns-left .product-info-main, .page-layout-2columns-right .product-info-main, .page-layout-3columns .product-info-main,.page-product-downloadable .product-options-bottom { | |||
| 8 | width: 57.17%; | 8 | width: 57.17%; | |||
| 9 | } | 9 | } | |||
| 10 | .page-layout-1column .product.media, .page-layout-2columns-left .product.media, .page-layout-2columns-right .product.media, .page-layout-3columns .product.media,.page-product-downloadable .product-options-wrapper { | 10 | .page-layout-1column .product.media, .page-layout-2columns-left .product.media, .page-layout-2columns-right .product.media, .page-layout-3columns .product.media,.page-product-downloadable .product-options-wrapper { | |||
| 11 | width: 40.83%; | 11 | width: 40.83%; | |||
| 12 | } | 12 | } | |||
| 13 | 13 | |||||
| 14 | .page-layout-1column .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-left .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-right .column.main > .custom-block ~ .product-info-main, .page-layout-3columns .column.main > .custom-block ~ .product-info-main { | 14 | .page-layout-1column .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-left .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-right .column.main > .custom-block ~ .product-info-main, .page-layout-3columns .column.main > .custom-block ~ .product-info-main { | |||
| 15 | width: 42.8775%; | 15 | width: 42.8775%; | |||
| 16 | } | 16 | } | |||
| 17 | .page-layout-1column .column.main > .custom-block ~ .product.media, .page-layout-2columns-left .column.main > .custom-block ~ .product.media, .page-layout-2columns-right .column.main > .custom-block ~ .product.media, .page-layout-3columns .column.main > .custom-block ~ .product.media { | 17 | .page-layout-1column .column.main > .custom-block ~ .product.media, .page-layout-2columns-left .column.main > .custom-block ~ .product.media, .page-layout-2columns-right .column.main > .custom-block ~ .product.media, .page-layout-3columns .column.main > .custom-block ~ .product.media { | |||
| 18 | width: 30.6225%; | 18 | width: 30.6225%; | |||
| 19 | } | 19 | } | |||
| 20 | } | 20 | } | |||
| 21 | 21 | |||||
| 22 | @media (max-width: 575px){ | 22 | @media (max-width: 575px){ | |||
| 23 | body { | 23 | body { | |||
| 24 | font-size: 13px; | 24 | font-size: 13px; | |||
| 25 | line-height: 21px; | 25 | line-height: 21px; | |||
| 26 | } | 26 | } | |||
| 27 | } | 27 | } | |||
| 28 | li, .porto-u-sub-heading, .porto-sicon-description { | |||||
| 29 | line-height: 22px; | |||||
| 30 | } | |||||
| 28 | h1, h2, h3, h4, h5, h6 { | 31 | h1, h2, h3, h4, h5, h6 { | |||
| 29 | font-family: Poppins,sans-serif; | 32 | font-family: Poppins,sans-serif; | |||
| 30 | color: #222529; | 33 | color: #222529; | |||
| 31 | letter-spacing: normal; | 34 | letter-spacing: normal; | |||
| 32 | } | 35 | } | |||
| 33 | h1 { | 36 | h1 { | |||
| 34 | font-weight: 700; | 37 | font-weight: 700; | |||
| 35 | font-size: 22px; | 38 | font-size: 22px; | |||
| 36 | line-height: 30px; | 39 | line-height: 30px; | |||
| 37 | margin: 0 0 32px 0; | 40 | margin: 0 0 32px 0; | |||
| 38 | } | 41 | } | |||
| 39 | h2 { | 42 | h2 { | |||
| 40 | font-weight: 700; | 43 | font-weight: 700; | |||
| 41 | font-size: 20px; | 44 | font-size: 20px; | |||
| 42 | line-height: 25px; | 45 | line-height: 25px; | |||
| 43 | margin: 0 0 32px 0; | 46 | margin: 0 0 32px 0; | |||
| 44 | } | 47 | } | |||
| 45 | h3 { | 48 | h3 { | |||
| 46 | font-weight: 700; | 49 | font-weight: 700; | |||
| 47 | font-size: 16px; | 50 | font-size: 16px; | |||
| 48 | line-height: 19px; | 51 | line-height: 19px; | |||
| 49 | margin: 0 0 20px 0; | 52 | margin: 0 0 20px 0; | |||
| 50 | } | 53 | } | |||
| 51 | h4 { | 54 | h4 { | |||
| 52 | font-weight: 700; | 55 | font-weight: 700; | |||
| 53 | font-size: 16px; | 56 | font-size: 16px; | |||
| 54 | line-height: 22px; | 57 | line-height: 22px; | |||
| 55 | margin: 0 0 14px 0; | 58 | margin: 0 0 14px 0; | |||
| 56 | } | 59 | } | |||
| 57 | h5 { | 60 | h5 { | |||
| 58 | font-weight: 700; | 61 | font-weight: 700; | |||
| 59 | font-size: 14px; | 62 | font-size: 14px; | |||
| 60 | line-height: 18px; | 63 | line-height: 18px; | |||
| 61 | margin: 0 0 14px 0; | 64 | margin: 0 0 14px 0; | |||
| 62 | } | 65 | } | |||
| 63 | h6 { | 66 | h6 { | |||
| 64 | font-weight: 600; | 67 | font-weight: 600; | |||
| 65 | font-size: 14px; | 68 | font-size: 14px; | |||
| 66 | line-height: 18px; | 69 | line-height: 18px; | |||
| 67 | color: #777; | 70 | color: #777; | |||
| 68 | } | 71 | } | |||
| 69 | .home-banner-slider h2.vc_custom_heading, .custom-font4 { | 72 | .home-banner-slider h2.vc_custom_heading, .custom-font4 { | |||
| 70 | font-family: 'Segoe Script','Savoye LET'; | 73 | font-family: 'Segoe Script','Savoye LET'; | |||
| 71 | } | 74 | } | |||
| 72 | html .heading-secondary, html .lnk-secondary, html .text-color-secondary { | 75 | html .heading-secondary, html .lnk-secondary, html .text-color-secondary { | |||
| 73 | color: #ff7272; | 76 | color: #ff7272; | |||
| 74 | } | 77 | } | |||
| 75 | html .btn-modern { | 78 | html .btn-modern { | |||
| 76 | text-transform: uppercase; | 79 | text-transform: uppercase; | |||
| 77 | font-size: .75rem; | 80 | font-size: .75rem; | |||
| 78 | padding: .75rem 1.5rem; | 81 | padding: .75rem 1.5rem; | |||
| 79 | font-weight: 600; | 82 | font-weight: 600; | |||
| 80 | height: auto; | 83 | height: auto; | |||
| 81 | } | 84 | } | |||
| 82 | html .action.primary, html .btn { | 85 | html .action.primary, html .btn { | |||
| 83 | font-family: Poppins; | 86 | font-family: Poppins; | |||
| 84 | letter-spacing: .01em; | 87 | letter-spacing: .01em; | |||
| 85 | font-weight: 700; | 88 | font-weight: 700; | |||
| 86 | line-height: 1.42857; | 89 | line-height: 1.42857; | |||
| 87 | padding: .8em 2em; | 90 | padding: .8em 2em; | |||
| 88 | } | 91 | } | |||
| 89 | html .btn-modern { | 92 | html .btn-modern { | |||
| 90 | font-size: .8125rem; | 93 | font-size: .8125rem; | |||
| 91 | padding: 1em 2.8em; | 94 | padding: 1em 2.8em; | |||
| 92 | } | 95 | } | |||
| 93 | html .action.primary { | 96 | html .action.primary { | |||
| 94 | color: #fff; | 97 | color: #fff; | |||
| 95 | background-color: #08c; | 98 | background-color: #08c; | |||
| 96 | border-color: #08c #08c #069; | 99 | border-color: #08c #08c #069; | |||
| 97 | } | 100 | } | |||
| 98 | html .btn-xl { | 101 | html .btn-xl { | |||
| 99 | font-size: 1rem; | 102 | font-size: 1rem; | |||
| 100 | padding: .8rem 2rem; | 103 | padding: .8rem 2rem; | |||
| 101 | } | 104 | } | |||
| 102 | .btn-modern.btn-xl { | 105 | .btn-modern.btn-xl { | |||
| 103 | font-size: 1rem; | 106 | font-size: 1rem; | |||
| 104 | padding: 1.25em 3.125em; | 107 | padding: 1.25em 3.125em; | |||
| 105 | } | 108 | } | |||
| 106 | .btn-flat { | 109 | .btn-flat { | |||
| 107 | padding: 0!important; | 110 | padding: 0!important; | |||
| 108 | background: none!important; | 111 | background: none!important; | |||
| 109 | border: none!important; | 112 | border: none!important; | |||
| 110 | border-bottom: 1px solid transparent!important; | 113 | border-bottom: 1px solid transparent!important; | |||
| 111 | box-shadow: none!important; | 114 | box-shadow: none!important; | |||
| 112 | text-transform: uppercase; | 115 | text-transform: uppercase; | |||
| 113 | font-size: .75rem; | 116 | font-size: .75rem; | |||
| 114 | } | 117 | } | |||
| 115 | html .btn-dark { | 118 | html .btn-dark { | |||
| 116 | color: #fff; | 119 | color: #fff; | |||
| 117 | background-color: #222529; | 120 | background-color: #222529; | |||
| 118 | border-color: #222529 #222529 #0b0c0e; | 121 | border-color: #222529 #222529 #0b0c0e; | |||
| 119 | } | 122 | } | |||
| 120 | html .btn-light { | 123 | html .btn-light { | |||
| 121 | color: #222529; | 124 | color: #222529; | |||
| 122 | background-color: #fff; | 125 | background-color: #fff; | |||
| 123 | border-color: #fff #fff #e6e6e6; | 126 | border-color: #fff #fff #e6e6e6; | |||
| 124 | } | 127 | } | |||
| 125 | html .btn-quaternary { | 128 | html .btn-quaternary { | |||
| 126 | color: #fff; | 129 | color: #fff; | |||
| 127 | background-color: #000; | 130 | background-color: #000; | |||
| 128 | border-color: #000 #000 #000; | 131 | border-color: #000 #000 #000; | |||
| 129 | } | 132 | } | |||
| 130 | html .background-color-secondary { | 133 | html .background-color-secondary { | |||
| 131 | background-color: #f4a085 !important; | 134 | background-color: #f4a085 !important; | |||
| 132 | } | 135 | } | |||
| 133 | .page-header .sw-megamenu.navigation li.level0 > em, .page-header .sw-megamenu.navigation li.level0 i { | 136 | .page-header .sw-megamenu.navigation li.level0 > em, .page-header .sw-megamenu.navigation li.level0 i { | |||
| 134 | display: none; | 137 | display: none; | |||
| 135 | } | 138 | } | |||
| 136 | .top-icon .porto-sicon-header { | 139 | .top-icon .porto-sicon-header { | |||
| 137 | margin-bottom: .75rem; | 140 | margin-bottom: .75rem; | |||
| 138 | } | 141 | } | |||
| 139 | .widget, .sidebar-content .widget {margin-top: 1.5rem;margin-bottom: 1.5rem;} | 142 | .widget, .sidebar-content .widget {margin-top: 1.5rem;margin-bottom: 1.5rem;} | |||
| 140 | .widget .widgettitle { | 143 | .widget .widgettitle { | |||
| 141 | font-size: 1rem; | 144 | font-size: 1rem; | |||
| 142 | letter-spacing: -.02em; | 145 | letter-spacing: -.02em; | |||
| 143 | } | 146 | } | |||
| 144 | .product-item-photo>a:not(.weltpixel-quickview):before { | 147 | .product-item-photo>a:not(.weltpixel-quickview):before { | |||
| 145 | content: ''; | 148 | content: ''; | |||
| 146 | position: absolute; | 149 | position: absolute; | |||
| 147 | left: 0; | 150 | left: 0; | |||
| 148 | top: 0; | 151 | top: 0; | |||
| 149 | width: 100%; | 152 | width: 100%; | |||
| 150 | height: 100%; | 153 | height: 100%; | |||
| 151 | background: rgba(0,0,0,.1); | 154 | background: rgba(0,0,0,.1); | |||
| 152 | z-index: 3; | 155 | z-index: 3; | |||
| 153 | opacity: 0; | 156 | opacity: 0; | |||
| 154 | transition: opacity .2s; | 157 | transition: opacity .2s; | |||
| 155 | } | 158 | } | |||
| 156 | .product-item-info:hover .product-item-photo>a:not(.weltpixel-quickview):before { | 159 | .product-item-info:hover .product-item-photo>a:not(.weltpixel-quickview):before { | |||
| 157 | opacity:1; | 160 | opacity:1; | |||
| 158 | } | 161 | } | |||
| 159 | .small-list.products-grid .product-items .product-item-info .product-item-photo:before {display: none;} | 162 | .small-list.products-grid .product-items .product-item-info .product-item-photo:before {display: none;} | |||
| 160 | .footer .widgettitle, .footer .widget-title { | 163 | .footer .widgettitle, .footer .widget-title { | |||
| 161 | font-size: .9375rem; | 164 | font-size: .9375rem; | |||
| 162 | font-weight: 600; | 165 | font-weight: 600; | |||
| 163 | } | 166 | } | |||
| 164 | html .background-color-secondary { | 167 | html .background-color-secondary { | |||
| 165 | background-color: #ff7272!important; | 168 | background-color: #ff7272!important; | |||
| 166 | } | 169 | } | |||
| 167 | .page-header .sw-megamenu.navigation li.level0 > em, .page-header .sw-megamenu.navigation li.level0 i { | 170 | .page-header .sw-megamenu.navigation li.level0 > em, .page-header .sw-megamenu.navigation li.level0 i { | |||
| 168 | display: none; | 171 | display: none; | |||
| 169 | } | 172 | } | |||
| 170 | .top-icon .porto-sicon-header { | 173 | .top-icon .porto-sicon-header { | |||
| 171 | margin-bottom: .75rem; | 174 | margin-bottom: .75rem; | |||
| 172 | } | 175 | } | |||
| 173 | .product-item-photo>a:not(.weltpixel-quickview):before { | 176 | .product-item-photo>a:not(.weltpixel-quickview):before { | |||
| 174 | content: ''; | 177 | content: ''; | |||
| 175 | position: absolute; | 178 | position: absolute; | |||
| 176 | left: 0; | 179 | left: 0; | |||
| 177 | top: 0; | 180 | top: 0; | |||
| 178 | width: 100%; | 181 | width: 100%; | |||
| 179 | height: 100%; | 182 | height: 100%; | |||
| 180 | background: rgba(0,0,0,.1); | 183 | background: rgba(0,0,0,.1); | |||
| 181 | z-index: 3; | 184 | z-index: 3; | |||
| 182 | opacity: 0; | 185 | opacity: 0; | |||
| 183 | transition: opacity .2s; | 186 | transition: opacity .2s; | |||
| 184 | } | 187 | } | |||
| 185 | .product-item-info:hover .product-item-photo>a:not(.weltpixel-quickview):before { | 188 | .product-item-info:hover .product-item-photo>a:not(.weltpixel-quickview):before { | |||
| 186 | opacity:1; | 189 | opacity:1; | |||
| 187 | } | 190 | } | |||
| 188 | .small-list.products-grid .product-items .product-item-info .product-item-photo:before {display: none;} | 191 | .small-list.products-grid .product-items .product-item-info .product-item-photo:before {display: none;} | |||
| 189 | .footer .widgettitle, .footer .widget-title { | 192 | .footer .widgettitle, .footer .widget-title { | |||
| 190 | font-size: .9375rem; | 193 | font-size: .9375rem; | |||
| 191 | font-weight: 600; | 194 | font-weight: 600; | |||
| 192 | } | 195 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.